bitkeeper revision 1.764 (4045d6c4YN7lqFoRs7xPiwKlS86frg)

Update xen-clone to use "make ARCH=xeno bzImage" commandline rather than
setting ARCH in the environment, which no longer seems to work.

diff --git a/tools/misc/xen-clone b/tools/misc/xen-clone
index d98311dc9eba8b400210e9ca44eded01fc948d42..984ec7cbe32562abcf8a4fc76342ac3e205892d9 100755 (executable)
--- a/tools/misc/xen-clone
+++ b/tools/misc/xen-clone
@@ -85,13 +85,12 @@ cd xenolinux-${LINUX_VER}-sparse
 cd ../..
 mv linux-${LINUX_VER} xenolinux-${LINUX_VER}
 cd xenolinux-${LINUX_VER}
-export ARCH=xeno
-export INSTALL_MOD_PATH=${TOP}/install
-make oldconfig
-make dep
-make bzImage
-make dist || make install
-make modules
-make modules_install
+
+make ARCH=xeno oldconfig
+make ARCH=xeno dep
+make ARCH=xeno bzImage
+make ARCH=xeno dist || make ARCH=xeno install
+make ARCH=xeno modules
+make ARCH=xeno INSTALL_MOD_PATH=${TOP}/install modules_install
 cd ..
 

diff --git a/xen/arch/i386/process.c b/xen/arch/i386/process.c
index 9adfb5ff40217a4d272f27e6e163fc0ad381943a..7df4f6d37ccee1a83a59635af0610e773d9c5a97 100644 (file)
--- a/xen/arch/i386/process.c
+++ b/xen/arch/i386/process.c
@@ -114,7 +114,7 @@ static inline void kb_wait(void)
 void machine_restart(char * __unused)
 {
     extern int opt_noreboot;
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
     int cpuid;
 #endif